1 files changed, 0 insertions, 179 deletions
diff --git a/libraries/spongycastle/core/src/main/java/org/spongycastle/asn1/cms/OriginatorIdentifierOrKey.java b/libraries/spongycastle/core/src/main/java/org/spongycastle/asn1/cms/OriginatorIdentifierOrKey.java
deleted file mode 100644
index 042daff83..000000000
--- a/libraries/spongycastle/core/src/main/java/org/spongycastle/asn1/cms/OriginatorIdentifierOrKey.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.spongycastle.asn1.cms;
-
-import org.spongycastle.asn1.ASN1Choice;
-import org.spongycastle.asn1.ASN1Encodable;
-import org.spongycastle.asn1.ASN1Object;
-import org.spongycastle.asn1.ASN1OctetString;
-import org.spongycastle.asn1.ASN1Primitive;
-import org.spongycastle.asn1.ASN1TaggedObject;
-import org.spongycastle.asn1.DERTaggedObject;
-import org.spongycastle.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.spongycastle.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();
-    }
-}