diff options
-rw-r--r-- | crypto/src/asn1/pkcs/CertBag.cs | 30 | ||||
-rw-r--r-- | crypto/src/asn1/pkcs/CrlBag.cs | 44 |
2 files changed, 55 insertions, 19 deletions
diff --git a/crypto/src/asn1/pkcs/CertBag.cs b/crypto/src/asn1/pkcs/CertBag.cs index ddaa353fb..b32b10ae0 100644 --- a/crypto/src/asn1/pkcs/CertBag.cs +++ b/crypto/src/asn1/pkcs/CertBag.cs @@ -14,39 +14,31 @@ namespace Org.BouncyCastle.Asn1.Pkcs return new CertBag(Asn1Sequence.GetInstance(obj)); } - private readonly DerObjectIdentifier certID; - private readonly Asn1Object certValue; + private readonly DerObjectIdentifier m_certID; + private readonly Asn1Object m_certValue; private CertBag(Asn1Sequence seq) { if (seq.Count != 2) - throw new ArgumentException("Wrong number of elements in sequence", "seq"); + throw new ArgumentException("Wrong number of elements in sequence", nameof(seq)); - this.certID = DerObjectIdentifier.GetInstance(seq[0]); - this.certValue = Asn1TaggedObject.GetInstance(seq[1]).GetObject(); + this.m_certID = DerObjectIdentifier.GetInstance(seq[0]); + this.m_certValue = Asn1TaggedObject.GetInstance(seq[1]).GetObject(); } - public CertBag( - DerObjectIdentifier certID, - Asn1Object certValue) + public CertBag(DerObjectIdentifier certID, Asn1Object certValue) { - this.certID = certID; - this.certValue = certValue; + m_certID = certID; + m_certValue = certValue; } - public virtual DerObjectIdentifier CertID - { - get { return certID; } - } + public virtual DerObjectIdentifier CertID => m_certID; - public virtual Asn1Object CertValue - { - get { return certValue; } - } + public virtual Asn1Object CertValue => m_certValue; public override Asn1Object ToAsn1Object() { - return new DerSequence(certID, new DerTaggedObject(0, certValue)); + return new DerSequence(m_certID, new DerTaggedObject(0, m_certValue)); } } } diff --git a/crypto/src/asn1/pkcs/CrlBag.cs b/crypto/src/asn1/pkcs/CrlBag.cs new file mode 100644 index 000000000..5cc68ace4 --- /dev/null +++ b/crypto/src/asn1/pkcs/CrlBag.cs @@ -0,0 +1,44 @@ +using System; + +namespace Org.BouncyCastle.Asn1.Pkcs +{ + public class CrlBag + : Asn1Encodable + { + public static CrlBag GetInstance(object obj) + { + if (obj is CrlBag crlBag) + return crlBag; + if (obj == null) + return null; + return new CrlBag(Asn1Sequence.GetInstance(obj)); + } + + private readonly DerObjectIdentifier m_crlID; + private readonly Asn1Encodable m_crlValue; + + private CrlBag(Asn1Sequence seq) + { + if (seq.Count != 2) + throw new ArgumentException("Wrong number of elements in sequence", nameof(seq)); + + m_crlID = DerObjectIdentifier.GetInstance(seq[0]); + m_crlValue = Asn1TaggedObject.GetInstance(seq[1]).GetObject(); + } + + public CrlBag(DerObjectIdentifier crlID, Asn1Encodable crlValue) + { + m_crlID = crlID; + m_crlValue = crlValue; + } + + public virtual DerObjectIdentifier CrlID => m_crlID; + + public virtual Asn1Encodable CrlValue => m_crlValue; + + public override Asn1Object ToAsn1Object() + { + return new DerSequence(m_crlID, new DerTaggedObject(0, m_crlValue)); + } + } +} |