diff options
Diffstat (limited to 'crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs')
| -rw-r--r-- | crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs b/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs index f197fe965..296cadf94 100644 --- a/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs +++ b/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs @@ -8,42 +8,24 @@ namespace Org.BouncyCastle.Asn1.Cms public class OriginatorIdentifierOrKey : Asn1Encodable, IAsn1Choice { - private Asn1Encodable id; + private readonly Asn1Encodable id; - public OriginatorIdentifierOrKey( - IssuerAndSerialNumber id) + public OriginatorIdentifierOrKey(IssuerAndSerialNumber id) { this.id = id; } - [Obsolete("Use version taking a 'SubjectKeyIdentifier'")] - public OriginatorIdentifierOrKey( - Asn1OctetString id) - : this(new SubjectKeyIdentifier(id)) - { - } - - public OriginatorIdentifierOrKey( - SubjectKeyIdentifier id) + public OriginatorIdentifierOrKey(SubjectKeyIdentifier id) { this.id = new DerTaggedObject(false, 0, id); } - public OriginatorIdentifierOrKey( - OriginatorPublicKey id) + public OriginatorIdentifierOrKey(OriginatorPublicKey id) { this.id = new DerTaggedObject(false, 1, id); } - [Obsolete("Use more specific version")] - public OriginatorIdentifierOrKey( - Asn1Object id) - { - this.id = id; - } - - private OriginatorIdentifierOrKey( - Asn1TaggedObject id) + private OriginatorIdentifierOrKey(Asn1TaggedObject id) { // TODO Add validation this.id = id; @@ -129,12 +111,6 @@ namespace Org.BouncyCastle.Asn1.Cms } } - [Obsolete("Use 'OriginatorPublicKey' property")] - public OriginatorPublicKey OriginatorKey - { - get { return OriginatorPublicKey; } - } - public OriginatorPublicKey OriginatorPublicKey { get |