diff options
Diffstat (limited to 'crypto/src/asn1/cms')
| -rw-r--r-- | crypto/src/asn1/cms/AuthEnvelopedDataParser.cs | 23 | ||||
| -rw-r--r-- | crypto/src/asn1/cms/AuthenticatedDataParser.cs | 38 | ||||
| -rw-r--r-- | crypto/src/asn1/cms/EncryptedContentInfoParser.cs | 2 | ||||
| -rw-r--r-- | crypto/src/asn1/cms/EnvelopedDataParser.cs | 18 | ||||
| -rw-r--r-- | crypto/src/asn1/cms/SignedDataParser.cs | 28 |
5 files changed, 59 insertions, 50 deletions
diff --git a/crypto/src/asn1/cms/AuthEnvelopedDataParser.cs b/crypto/src/asn1/cms/AuthEnvelopedDataParser.cs index 1e1e72c02..e61754e65 100644 --- a/crypto/src/asn1/cms/AuthEnvelopedDataParser.cs +++ b/crypto/src/asn1/cms/AuthEnvelopedDataParser.cs @@ -49,11 +49,14 @@ namespace Org.BouncyCastle.Asn1.Cms nextObject = seq.ReadObject(); } - if (nextObject is Asn1TaggedObjectParser && ((Asn1TaggedObjectParser)nextObject).TagNo == 0) + if (nextObject is Asn1TaggedObjectParser o) { - Asn1SequenceParser originatorInfo = (Asn1SequenceParser) ((Asn1TaggedObjectParser)nextObject).GetObjectParser(Asn1Tags.Sequence, false); - nextObject = null; - return OriginatorInfo.GetInstance(originatorInfo.ToAsn1Object()); + if (o.HasContextTag(0)) + { + Asn1SequenceParser originatorInfo = (Asn1SequenceParser)o.ParseBaseUniversal(false, Asn1Tags.Sequence); + nextObject = null; + return OriginatorInfo.GetInstance(originatorInfo.ToAsn1Object()); + } } return null; @@ -102,15 +105,13 @@ namespace Org.BouncyCastle.Asn1.Cms nextObject = seq.ReadObject(); } - if (nextObject is Asn1TaggedObjectParser) + if (nextObject is Asn1TaggedObjectParser o) { - IAsn1Convertible o = nextObject; nextObject = null; - return (Asn1SetParser)((Asn1TaggedObjectParser)o).GetObjectParser(Asn1Tags.Set, false); + return (Asn1SetParser)Asn1Utilities.ParseContextBaseUniversal(o, 1, false, Asn1Tags.SetOf); } - // "The authAttrs MUST be present if the content type carried in - // EncryptedContentInfo is not id-data." + // "The authAttrs MUST be present if the content type carried in EncryptedContentInfo is not id-data." if (!isData) throw new Asn1ParsingException("authAttrs must be present with non-data content"); @@ -139,9 +140,9 @@ namespace Org.BouncyCastle.Asn1.Cms if (nextObject != null) { - IAsn1Convertible o = nextObject; + Asn1TaggedObjectParser o = (Asn1TaggedObjectParser)nextObject; nextObject = null; - return (Asn1SetParser)((Asn1TaggedObjectParser)o).GetObjectParser(Asn1Tags.Set, false); + return (Asn1SetParser)Asn1Utilities.ParseContextBaseUniversal(o, 2, false, Asn1Tags.SetOf); } return null; diff --git a/crypto/src/asn1/cms/AuthenticatedDataParser.cs b/crypto/src/asn1/cms/AuthenticatedDataParser.cs index 4b80d1b02..54dee99e8 100644 --- a/crypto/src/asn1/cms/AuthenticatedDataParser.cs +++ b/crypto/src/asn1/cms/AuthenticatedDataParser.cs @@ -53,12 +53,15 @@ namespace Org.BouncyCastle.Asn1.Cms nextObject = seq.ReadObject(); } - if (nextObject is Asn1TaggedObjectParser && ((Asn1TaggedObjectParser)nextObject).TagNo == 0) - { - Asn1SequenceParser originatorInfo = (Asn1SequenceParser) ((Asn1TaggedObjectParser)nextObject).GetObjectParser(Asn1Tags.Sequence, false); - nextObject = null; - return OriginatorInfo.GetInstance(originatorInfo.ToAsn1Object()); - } + if (nextObject is Asn1TaggedObjectParser o) + { + if (o.HasContextTag(0)) + { + Asn1SequenceParser originatorInfo = (Asn1SequenceParser)o.ParseBaseUniversal(false, Asn1Tags.Sequence); + nextObject = null; + return OriginatorInfo.GetInstance(originatorInfo.ToAsn1Object()); + } + } return null; } @@ -139,12 +142,11 @@ namespace Org.BouncyCastle.Asn1.Cms nextObject = seq.ReadObject(); } - if (nextObject is Asn1TaggedObjectParser) - { - IAsn1Convertible o = nextObject; - nextObject = null; - return (Asn1SetParser)((Asn1TaggedObjectParser)o).GetObjectParser(Asn1Tags.Set, false); - } + if (nextObject is Asn1TaggedObjectParser o) + { + nextObject = null; + return (Asn1SetParser)Asn1Utilities.ParseContextBaseUniversal(o, 2, false, Asn1Tags.SetOf); + } return null; } @@ -169,12 +171,12 @@ namespace Org.BouncyCastle.Asn1.Cms nextObject = seq.ReadObject(); } - if (nextObject != null) - { - IAsn1Convertible o = nextObject; - nextObject = null; - return (Asn1SetParser)((Asn1TaggedObjectParser)o).GetObjectParser(Asn1Tags.Set, false); - } + if (nextObject != null) + { + Asn1TaggedObject o = (Asn1TaggedObject)nextObject; + nextObject = null; + return (Asn1SetParser)Asn1Utilities.ParseContextBaseUniversal(o, 3, false, Asn1Tags.SetOf); + } return null; } diff --git a/crypto/src/asn1/cms/EncryptedContentInfoParser.cs b/crypto/src/asn1/cms/EncryptedContentInfoParser.cs index af748b1b3..09434d7ef 100644 --- a/crypto/src/asn1/cms/EncryptedContentInfoParser.cs +++ b/crypto/src/asn1/cms/EncryptedContentInfoParser.cs @@ -40,7 +40,7 @@ namespace Org.BouncyCastle.Asn1.Cms public IAsn1Convertible GetEncryptedContent( int tag) { - return _encryptedContent.GetObjectParser(tag, false); + return Asn1Utilities.ParseContextBaseUniversal(_encryptedContent, 0, false, tag); } } } diff --git a/crypto/src/asn1/cms/EnvelopedDataParser.cs b/crypto/src/asn1/cms/EnvelopedDataParser.cs index 599353791..a86608bb4 100644 --- a/crypto/src/asn1/cms/EnvelopedDataParser.cs +++ b/crypto/src/asn1/cms/EnvelopedDataParser.cs @@ -42,12 +42,14 @@ namespace Org.BouncyCastle.Asn1.Cms _nextObject = _seq.ReadObject(); } - if (_nextObject is Asn1TaggedObjectParser && ((Asn1TaggedObjectParser)_nextObject).TagNo == 0) + if (_nextObject is Asn1TaggedObjectParser o) { - Asn1SequenceParser originatorInfo = (Asn1SequenceParser) - ((Asn1TaggedObjectParser)_nextObject).GetObjectParser(Asn1Tags.Sequence, false); - _nextObject = null; - return OriginatorInfo.GetInstance(originatorInfo.ToAsn1Object()); + if (o.HasContextTag(0)) + { + Asn1SequenceParser originatorInfo = (Asn1SequenceParser)o.ParseBaseUniversal(false, Asn1Tags.Sequence); + _nextObject = null; + return OriginatorInfo.GetInstance(originatorInfo.ToAsn1Object()); + } } return null; @@ -96,11 +98,11 @@ namespace Org.BouncyCastle.Asn1.Cms if (_nextObject != null) { - IAsn1Convertible o = _nextObject; + Asn1TaggedObjectParser o = (Asn1TaggedObjectParser)_nextObject; _nextObject = null; - return (Asn1SetParser)((Asn1TaggedObjectParser)o).GetObjectParser(Asn1Tags.Set, false); + return (Asn1SetParser)Asn1Utilities.ParseContextBaseUniversal(o, 1, false, Asn1Tags.SetOf); } - + return null; } } diff --git a/crypto/src/asn1/cms/SignedDataParser.cs b/crypto/src/asn1/cms/SignedDataParser.cs index cd07f4057..64114f292 100644 --- a/crypto/src/asn1/cms/SignedDataParser.cs +++ b/crypto/src/asn1/cms/SignedDataParser.cs @@ -64,12 +64,14 @@ namespace Org.BouncyCastle.Asn1.Cms _certsCalled = true; _nextObject = _seq.ReadObject(); - if (_nextObject is Asn1TaggedObjectParser && ((Asn1TaggedObjectParser)_nextObject).TagNo == 0) + if (_nextObject is Asn1TaggedObjectParser o) { - Asn1SetParser certs = (Asn1SetParser)((Asn1TaggedObjectParser)_nextObject).GetObjectParser(Asn1Tags.Set, false); - _nextObject = null; - - return certs; + if (o.HasContextTag(0)) + { + Asn1SetParser certs = (Asn1SetParser)o.ParseBaseUniversal(false, Asn1Tags.SetOf); + _nextObject = null; + return certs; + } } return null; @@ -87,16 +89,18 @@ namespace Org.BouncyCastle.Asn1.Cms _nextObject = _seq.ReadObject(); } - if (_nextObject is Asn1TaggedObjectParser && ((Asn1TaggedObjectParser)_nextObject).TagNo == 1) + if (_nextObject is Asn1TaggedObjectParser o) { - Asn1SetParser crls = (Asn1SetParser)((Asn1TaggedObjectParser)_nextObject).GetObjectParser(Asn1Tags.Set, false); - _nextObject = null; - - return crls; + if (o.HasContextTag(1)) + { + Asn1SetParser crls = (Asn1SetParser)o.ParseBaseUniversal(false, Asn1Tags.SetOf); + _nextObject = null; + return crls; + } } - return null; - } + return null; + } public Asn1SetParser GetSignerInfos() { |