1 files changed, 0 insertions, 208 deletions
diff --git a/libraries/spongycastle/prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java b/libraries/spongycastle/prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java
deleted file mode 100644
index 3a96e05b5..000000000
--- a/libraries/spongycastle/prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package org.spongycastle.x509;
-
-import java.io.IOException;
-import java.security.Principal;
-import java.security.cert.CertSelector;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.spongycastle.asn1.ASN1Encodable;
-import org.spongycastle.asn1.DERSequence;
-import org.spongycastle.asn1.x509.AttCertIssuer;
-import org.spongycastle.asn1.x509.GeneralName;
-import org.spongycastle.asn1.x509.GeneralNames;
-import org.spongycastle.asn1.x509.V2Form;
-import org.spongycastle.jce.X509Principal;
-import org.spongycastle.util.Selector;
-
-/**
- * Carrying class for an attribute certificate issuer.
- * @deprecated use org.spongycastle.cert.AttributeCertificateIssuer
- */
-public class AttributeCertificateIssuer
-    implements CertSelector, Selector
-{
-    final ASN1Encodable form;
-
-    /**
-     * Set the issuer directly with the ASN.1 structure.
-     * 
-     * @param issuer The issuer
-     */
-    public AttributeCertificateIssuer(AttCertIssuer issuer)
-    {
-        form = issuer.getIssuer();
-    }
-
-    public AttributeCertificateIssuer(X500Principal principal)
-        throws IOException
-    {
-        this(new X509Principal(principal.getEncoded()));
-    }
-
-    public AttributeCertificateIssuer(X509Principal principal)
-    {
-        form = new V2Form(GeneralNames.getInstance(new DERSequence(new GeneralName(principal))));
-    }
-
-    private Object[] getNames()
-    {
-        GeneralNames name;
-
-        if (form instanceof V2Form)
-        {
-            name = ((V2Form)form).getIssuerName();
-        }
-        else
-        {
-            name = (GeneralNames)form;
-        }
-
-        GeneralName[] names = name.getNames();
-
-        List l = new ArrayList(names.length);
-
-        for (int i = 0; i != names.length; i++)
-        {
-            if (names[i].getTagNo() == GeneralName.directoryName)
-            {
-                try
-                {
-                    l.add(new X500Principal(
-                        ((ASN1Encodable)names[i].getName()).toASN1Primitive().getEncoded()));
-                }
-                catch (IOException e)
-                {
-                    throw new RuntimeException("badly formed Name object");
-                }
-            }
-        }
-
-        return l.toArray(new Object[l.size()]);
-    }
-
-    /**
-     * Return any principal objects inside the attribute certificate issuer
-     * object.
-     * 
-     * @return an array of Principal objects (usually X500Principal)
-     */
-    public Principal[] getPrincipals()
-    {
-        Object[] p = this.getNames();
-        List l = new ArrayList();
-
-        for (int i = 0; i != p.length; i++)
-        {
-            if (p[i] instanceof Principal)
-            {
-                l.add(p[i]);
-            }
-        }
-
-        return (Principal[])l.toArray(new Principal[l.size()]);
-    }
-
-    private boolean matchesDN(X500Principal subject, GeneralNames targets)
-    {
-        GeneralName[] names = targets.getNames();
-
-        for (int i = 0; i != names.length; i++)
-        {
-            GeneralName gn = names[i];
-
-            if (gn.getTagNo() == GeneralName.directoryName)
-            {
-                try
-                {
-                    if (new X500Principal(((ASN1Encodable)gn.getName()).toASN1Primitive().getEncoded()).equals(subject))
-                    {
-                        return true;
-                    }
-                }
-                catch (IOException e)
-                {
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public Object clone()
-    {
-        return new AttributeCertificateIssuer(AttCertIssuer.getInstance(form));
-    }
-
-    public boolean match(Certificate cert)
-    {
-        if (!(cert instanceof X509Certificate))
-        {
-            return false;
-        }
-
-        X509Certificate x509Cert = (X509Certificate)cert;
-
-        if (form instanceof V2Form)
-        {
-            V2Form issuer = (V2Form)form;
-            if (issuer.getBaseCertificateID() != null)
-            {
-                return issuer.getBaseCertificateID().getSerial().getValue().equals(x509Cert.getSerialNumber())
-                    && matchesDN(x509Cert.getIssuerX500Principal(), issuer.getBaseCertificateID().getIssuer());
-            }
-
-            GeneralNames name = issuer.getIssuerName();
-            if (matchesDN(x509Cert.getSubjectX500Principal(), name))
-            {
-                return true;
-            }
-        }
-        else
-        {
-            GeneralNames name = (GeneralNames)form;
-            if (matchesDN(x509Cert.getSubjectX500Principal(), name))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (obj == this)
-        {
-            return true;
-        }
-
-        if (!(obj instanceof AttributeCertificateIssuer))
-        {
-            return false;
-        }
-
-        AttributeCertificateIssuer other = (AttributeCertificateIssuer)obj;
-
-        return this.form.equals(other.form);
-    }
-
-    public int hashCode()
-    {
-        return this.form.hashCode();
-    }
-
-    public boolean match(Object obj)
-    {
-        if (!(obj instanceof X509Certificate))
-        {
-            return false;
-        }
-
-        return match((Certificate)obj);
-    }
-}