diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-07-18 12:06:03 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-07-18 12:06:03 +0700 |
| commit | 913eada3ad9394f1327a1feb80a3261f7c6e55bb (patch) | |
| tree | 6366c1e196ad2ac249edf12a4d41d52ee2d28629 /crypto/src/asn1/esf | |
| parent | Refactoring around PrivateKeyInfo (diff) | |
| download | BouncyCastle.NET-ed25519-913eada3ad9394f1327a1feb80a3261f7c6e55bb.tar.xz | |
Deprecated Asn1TaggedObject.GetObject and refactor
Diffstat (limited to 'crypto/src/asn1/esf')
| -rw-r--r-- | crypto/src/asn1/esf/CrlOcspRef.cs | 32 | ||||
| -rw-r--r-- | crypto/src/asn1/esf/RevocationValues.cs | 16 | ||||
| -rw-r--r-- | crypto/src/asn1/esf/SignerLocation.cs | 4 |
3 files changed, 26 insertions, 26 deletions
diff --git a/crypto/src/asn1/esf/CrlOcspRef.cs b/crypto/src/asn1/esf/CrlOcspRef.cs index 6f55ff057..3b7598c9f 100644 --- a/crypto/src/asn1/esf/CrlOcspRef.cs +++ b/crypto/src/asn1/esf/CrlOcspRef.cs @@ -36,29 +36,27 @@ namespace Org.BouncyCastle.Asn1.Esf "obj"); } - private CrlOcspRef( - Asn1Sequence seq) + private CrlOcspRef(Asn1Sequence seq) { if (seq == null) throw new ArgumentNullException("seq"); - foreach (Asn1TaggedObject taggedObj in seq) + foreach (var element in seq) { - Asn1Object asn1Obj = taggedObj.GetObject(); - - switch (taggedObj.TagNo) + var o = Asn1TaggedObject.GetInstance(element, Asn1Tags.ContextSpecific); + switch (o.TagNo) { - case 0: - this.crlids = CrlListID.GetInstance(asn1Obj); - break; - case 1: - this.ocspids = OcspListID.GetInstance(asn1Obj); - break; - case 2: - this.otherRev = OtherRevRefs.GetInstance(asn1Obj); - break; - default: - throw new ArgumentException("Illegal tag in CrlOcspRef", "seq"); + case 0: + this.crlids = CrlListID.GetInstance(o.GetExplicitBaseObject()); + break; + case 1: + this.ocspids = OcspListID.GetInstance(o.GetExplicitBaseObject()); + break; + case 2: + this.otherRev = OtherRevRefs.GetInstance(o.GetExplicitBaseObject()); + break; + default: + throw new ArgumentException("Illegal tag in CrlOcspRef", "seq"); } } } diff --git a/crypto/src/asn1/esf/RevocationValues.cs b/crypto/src/asn1/esf/RevocationValues.cs index f3b36f1d1..497bf15f2 100644 --- a/crypto/src/asn1/esf/RevocationValues.cs +++ b/crypto/src/asn1/esf/RevocationValues.cs @@ -41,29 +41,29 @@ namespace Org.BouncyCastle.Asn1.Esf if (seq.Count > 3) throw new ArgumentException("Bad sequence size: " + seq.Count, nameof(seq)); - foreach (Asn1TaggedObject taggedObj in seq) + foreach (var element in seq) { - Asn1Object asn1Obj = taggedObj.GetObject(); - switch (taggedObj.TagNo) + var o = Asn1TaggedObject.GetInstance(element, Asn1Tags.ContextSpecific); + switch (o.TagNo) { case 0: - Asn1Sequence crlValsSeq = (Asn1Sequence)asn1Obj; + Asn1Sequence crlValsSeq = (Asn1Sequence)o.GetExplicitBaseObject(); // Validate - crlValsSeq.MapElements(element => CertificateList.GetInstance(element.ToAsn1Object())); + crlValsSeq.MapElements(CertificateList.GetInstance); m_crlVals = crlValsSeq; break; case 1: - Asn1Sequence ocspValsSeq = (Asn1Sequence)asn1Obj; + Asn1Sequence ocspValsSeq = (Asn1Sequence)o.GetExplicitBaseObject(); // Validate - ocspValsSeq.MapElements(element => BasicOcspResponse.GetInstance(element.ToAsn1Object())); + ocspValsSeq.MapElements(BasicOcspResponse.GetInstance); m_ocspVals = ocspValsSeq; break; case 2: - m_otherRevVals = OtherRevVals.GetInstance(asn1Obj); + m_otherRevVals = OtherRevVals.GetInstance(o.GetExplicitBaseObject()); break; default: throw new ArgumentException("Illegal tag in RevocationValues", nameof(seq)); diff --git a/crypto/src/asn1/esf/SignerLocation.cs b/crypto/src/asn1/esf/SignerLocation.cs index 106a32c59..7b1300045 100644 --- a/crypto/src/asn1/esf/SignerLocation.cs +++ b/crypto/src/asn1/esf/SignerLocation.cs @@ -25,8 +25,10 @@ namespace Org.BouncyCastle.Asn1.Esf public SignerLocation(Asn1Sequence seq) { - foreach (Asn1TaggedObject obj in seq) + foreach (var element in seq) { + var obj = Asn1TaggedObject.GetInstance(element, Asn1Tags.ContextSpecific); + switch (obj.TagNo) { case 0: |