diff options
Diffstat (limited to 'crypto/src/asn1/cms')
21 files changed, 70 insertions, 55 deletions
diff --git a/crypto/src/asn1/cms/AuthEnvelopedData.cs b/crypto/src/asn1/cms/AuthEnvelopedData.cs index 62d54b33e..cdc6fd198 100644 --- a/crypto/src/asn1/cms/AuthEnvelopedData.cs +++ b/crypto/src/asn1/cms/AuthEnvelopedData.cs @@ -49,12 +49,12 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); m_version = DerInteger.GetInstance(seq[pos++]); - m_originatorInfo = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, OriginatorInfo.GetInstance); + m_originatorInfo = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, OriginatorInfo.GetTagged); m_recipientInfos = Asn1Set.GetInstance(seq[pos++]); m_authEncryptedContentInfo = EncryptedContentInfo.GetInstance(seq[pos++]); - m_authAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetInstance); + m_authAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetTagged); m_mac = Asn1OctetString.GetInstance(seq[pos++]); - m_unauthAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 2, false, Asn1Set.GetInstance); + m_unauthAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 2, false, Asn1Set.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/AuthenticatedData.cs b/crypto/src/asn1/cms/AuthenticatedData.cs index fad7de35f..285a16840 100644 --- a/crypto/src/asn1/cms/AuthenticatedData.cs +++ b/crypto/src/asn1/cms/AuthenticatedData.cs @@ -56,14 +56,14 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); m_version = DerInteger.GetInstance(seq[pos++]); - m_originatorInfo = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, OriginatorInfo.GetInstance); + m_originatorInfo = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, OriginatorInfo.GetTagged); m_recipientInfos = Asn1Set.GetInstance(seq[pos++]); m_macAlgorithm = AlgorithmIdentifier.GetInstance(seq[pos++]); - m_digestAlgorithm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, AlgorithmIdentifier.GetInstance); + m_digestAlgorithm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, AlgorithmIdentifier.GetTagged); m_encapsulatedContentInfo = ContentInfo.GetInstance(seq[pos++]); - m_authAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 2, false, Asn1Set.GetInstance); + m_authAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 2, false, Asn1Set.GetTagged); m_mac = Asn1OctetString.GetInstance(seq[pos++]); - m_unauthAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 3, false, Asn1Set.GetInstance); + m_unauthAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 3, false, Asn1Set.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/CmsAlgorithmProtection.cs b/crypto/src/asn1/cms/CmsAlgorithmProtection.cs index 9923b0259..7c538651c 100644 --- a/crypto/src/asn1/cms/CmsAlgorithmProtection.cs +++ b/crypto/src/asn1/cms/CmsAlgorithmProtection.cs @@ -76,8 +76,8 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); m_digestAlgorithm = AlgorithmIdentifier.GetInstance(seq[pos++]); - m_signatureAlgorithm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, AlgorithmIdentifier.GetInstance); - m_macAlgorithm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 2, false, AlgorithmIdentifier.GetInstance); + m_signatureAlgorithm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, AlgorithmIdentifier.GetTagged); + m_macAlgorithm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 2, false, AlgorithmIdentifier.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/ContentInfo.cs b/crypto/src/asn1/cms/ContentInfo.cs index b440b06a9..b9e554984 100644 --- a/crypto/src/asn1/cms/ContentInfo.cs +++ b/crypto/src/asn1/cms/ContentInfo.cs @@ -14,10 +14,11 @@ namespace Org.BouncyCastle.Asn1.Cms return new ContentInfo(Asn1Sequence.GetInstance(obj)); } - public static ContentInfo GetInstance(Asn1TaggedObject obj, bool isExplicit) - { - return new ContentInfo(Asn1Sequence.GetInstance(obj, isExplicit)); - } + public static ContentInfo GetInstance(Asn1TaggedObject obj, bool isExplicit) => + new ContentInfo(Asn1Sequence.GetInstance(obj, isExplicit)); + + public static ContentInfo GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + new ContentInfo(Asn1Sequence.GetTagged(taggedObject, declaredExplicit)); private readonly DerObjectIdentifier m_contentType; private readonly Asn1Encodable m_content; diff --git a/crypto/src/asn1/cms/EncryptedContentInfo.cs b/crypto/src/asn1/cms/EncryptedContentInfo.cs index 94a5c00c2..3c9718b80 100644 --- a/crypto/src/asn1/cms/EncryptedContentInfo.cs +++ b/crypto/src/asn1/cms/EncryptedContentInfo.cs @@ -46,7 +46,7 @@ namespace Org.BouncyCastle.Asn1.Cms m_contentType = DerObjectIdentifier.GetInstance(seq[pos++]); m_contentEncryptionAlgorithm = AlgorithmIdentifier.GetInstance(seq[pos++]); - m_encryptedContent = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, Asn1OctetString.GetInstance); + m_encryptedContent = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, Asn1OctetString.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/EncryptedData.cs b/crypto/src/asn1/cms/EncryptedData.cs index 04ea382c7..03387bcdb 100644 --- a/crypto/src/asn1/cms/EncryptedData.cs +++ b/crypto/src/asn1/cms/EncryptedData.cs @@ -43,7 +43,7 @@ namespace Org.BouncyCastle.Asn1.Cms m_version = DerInteger.GetInstance(seq[pos++]); m_encryptedContentInfo = EncryptedContentInfo.GetInstance(seq[pos++]); - m_unprotectedAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetInstance); + m_unprotectedAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/EnvelopedData.cs b/crypto/src/asn1/cms/EnvelopedData.cs index 846062f1c..4a13b3f3f 100644 --- a/crypto/src/asn1/cms/EnvelopedData.cs +++ b/crypto/src/asn1/cms/EnvelopedData.cs @@ -48,10 +48,10 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); m_version = DerInteger.GetInstance(seq[pos++]); - m_originatorInfo = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, OriginatorInfo.GetInstance); + m_originatorInfo = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, OriginatorInfo.GetTagged); m_recipientInfos = Asn1Set.GetInstance(seq[pos++]); m_encryptedContentInfo = EncryptedContentInfo.GetInstance(seq[pos++]); - m_unprotectedAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetInstance); + m_unprotectedAttrs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/Evidence.cs b/crypto/src/asn1/cms/Evidence.cs index f3687009a..46f55442d 100644 --- a/crypto/src/asn1/cms/Evidence.cs +++ b/crypto/src/asn1/cms/Evidence.cs @@ -20,10 +20,11 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Unknown object in GetInstance: " + Platform.GetTypeName(obj), nameof(obj)); } - public static Evidence GetInstance(Asn1TaggedObject obj, bool isExplicit) - { - return Asn1Utilities.GetInstanceFromChoice(obj, isExplicit, GetInstance); - } + public static Evidence GetInstance(Asn1TaggedObject obj, bool isExplicit) => + Asn1Utilities.GetInstanceChoice(obj, isExplicit, GetInstance); + + public static Evidence GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetTaggedChoice(taggedObject, declaredExplicit, GetInstance); private readonly TimeStampTokenEvidence m_tstEvidence; private readonly EvidenceRecord m_ersEvidence; diff --git a/crypto/src/asn1/cms/KemRecipientInfo.cs b/crypto/src/asn1/cms/KemRecipientInfo.cs index ccfae719c..8d650588a 100644 --- a/crypto/src/asn1/cms/KemRecipientInfo.cs +++ b/crypto/src/asn1/cms/KemRecipientInfo.cs @@ -72,7 +72,7 @@ namespace Org.BouncyCastle.Asn1.Cms m_kemct = Asn1OctetString.GetInstance(seq[pos++]); m_kdf = AlgorithmIdentifier.GetInstance(seq[pos++]); m_kekLength = DerInteger.GetInstance(seq[pos++]); - m_ukm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, true, Asn1OctetString.GetInstance); + m_ukm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, true, Asn1OctetString.GetTagged); m_wrap = AlgorithmIdentifier.GetInstance(seq[pos++]); m_encryptedKey = Asn1OctetString.GetInstance(seq[pos++]); diff --git a/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs b/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs index fb393b9ba..cbbc9d8ba 100644 --- a/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs +++ b/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs @@ -30,10 +30,11 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Invalid KeyAgreeRecipientIdentifier: " + Platform.GetTypeName(obj), nameof(obj)); } - public static KeyAgreeRecipientIdentifier GetInstance(Asn1TaggedObject obj, bool isExplicit) - { - return Asn1Utilities.GetInstanceFromChoice(obj, isExplicit, GetInstance); - } + public static KeyAgreeRecipientIdentifier GetInstance(Asn1TaggedObject obj, bool isExplicit) => + Asn1Utilities.GetInstanceChoice(obj, isExplicit, GetInstance); + + public static KeyAgreeRecipientIdentifier GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetTaggedChoice(taggedObject, declaredExplicit, GetInstance); private readonly IssuerAndSerialNumber m_issuerSerial; private readonly RecipientKeyIdentifier m_rKeyID; diff --git a/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs b/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs index c1255adc9..8173005a9 100644 --- a/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs +++ b/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs @@ -49,8 +49,8 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); m_version = DerInteger.GetInstance(seq[pos++]); - m_originator = Asn1Utilities.ReadContextTagged(seq, ref pos, 0, true, OriginatorIdentifierOrKey.GetInstance); - m_ukm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, true, Asn1OctetString.GetInstance); + m_originator = Asn1Utilities.ReadContextTagged(seq, ref pos, 0, true, OriginatorIdentifierOrKey.GetTagged); + m_ukm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, true, Asn1OctetString.GetTagged); m_keyEncryptionAlgorithm = AlgorithmIdentifier.GetInstance(seq[pos++]); m_recipientEncryptedKeys = Asn1Sequence.GetInstance(seq[pos++]); diff --git a/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs b/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs index f5cc1f2f7..e4f028ba0 100644 --- a/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs +++ b/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs @@ -34,10 +34,11 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Invalid OriginatorIdentifierOrKey: " + Platform.GetTypeName(o), nameof(o)); } - public static OriginatorIdentifierOrKey GetInstance(Asn1TaggedObject o, bool explicitly) - { - return Asn1Utilities.GetInstanceFromChoice(o, explicitly, GetInstance); - } + public static OriginatorIdentifierOrKey GetInstance(Asn1TaggedObject o, bool explicitly) => + Asn1Utilities.GetInstanceChoice(o, explicitly, GetInstance); + + public static OriginatorIdentifierOrKey GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetTaggedChoice(taggedObject, declaredExplicit, GetInstance); private readonly Asn1Encodable m_id; diff --git a/crypto/src/asn1/cms/OriginatorInfo.cs b/crypto/src/asn1/cms/OriginatorInfo.cs index 74569cbec..6b65dd03f 100644 --- a/crypto/src/asn1/cms/OriginatorInfo.cs +++ b/crypto/src/asn1/cms/OriginatorInfo.cs @@ -23,6 +23,13 @@ namespace Org.BouncyCastle.Asn1.Cms #pragma warning restore CS0618 // Type or member is obsolete } + public static OriginatorInfo GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) + { +#pragma warning disable CS0618 // Type or member is obsolete + return new OriginatorInfo(Asn1Sequence.GetTagged(taggedObject, declaredExplicit)); +#pragma warning restore CS0618 // Type or member is obsolete + } + private readonly Asn1Set m_certs; private readonly Asn1Set m_crls; @@ -39,8 +46,8 @@ namespace Org.BouncyCastle.Asn1.Cms if (count < 0 || count > 2) throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); - m_certs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, Asn1Set.GetInstance); - m_crls = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetInstance); + m_certs = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, Asn1Set.GetTagged); + m_crls = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/PasswordRecipientInfo.cs b/crypto/src/asn1/cms/PasswordRecipientInfo.cs index 41ab686ef..a359cd12a 100644 --- a/crypto/src/asn1/cms/PasswordRecipientInfo.cs +++ b/crypto/src/asn1/cms/PasswordRecipientInfo.cs @@ -53,7 +53,7 @@ namespace Org.BouncyCastle.Asn1.Cms m_version = DerInteger.GetInstance(seq[pos++]); m_keyDerivationAlgorithm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, - AlgorithmIdentifier.GetInstance); + AlgorithmIdentifier.GetTagged); m_keyEncryptionAlgorithm = AlgorithmIdentifier.GetInstance(seq[pos++]); m_encryptedKey = Asn1OctetString.GetInstance(seq[pos++]); } diff --git a/crypto/src/asn1/cms/RecipientIdentifier.cs b/crypto/src/asn1/cms/RecipientIdentifier.cs index 4fe181dff..24469b305 100644 --- a/crypto/src/asn1/cms/RecipientIdentifier.cs +++ b/crypto/src/asn1/cms/RecipientIdentifier.cs @@ -23,10 +23,11 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Illegal object in RecipientIdentifier: " + Platform.GetTypeName(o), nameof(o)); } - public static RecipientIdentifier GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) - { - return Asn1Utilities.GetInstanceFromChoice(taggedObject, declaredExplicit, GetInstance); - } + public static RecipientIdentifier GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetInstanceChoice(taggedObject, declaredExplicit, GetInstance); + + public static RecipientIdentifier GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetTaggedChoice(taggedObject, declaredExplicit, GetInstance); private readonly Asn1Encodable m_id; diff --git a/crypto/src/asn1/cms/RecipientInfo.cs b/crypto/src/asn1/cms/RecipientInfo.cs index 424ea4d10..cb98e4784 100644 --- a/crypto/src/asn1/cms/RecipientInfo.cs +++ b/crypto/src/asn1/cms/RecipientInfo.cs @@ -24,10 +24,11 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(o), nameof(o)); } - public static RecipientInfo GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) - { - return Asn1Utilities.GetInstanceFromChoice(taggedObject, declaredExplicit, GetInstance); - } + public static RecipientInfo GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetInstanceChoice(taggedObject, declaredExplicit, GetInstance); + + public static RecipientInfo GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetTaggedChoice(taggedObject, declaredExplicit, GetInstance); private readonly Asn1Encodable m_info; diff --git a/crypto/src/asn1/cms/SCVPReqRes.cs b/crypto/src/asn1/cms/SCVPReqRes.cs index 11df63ea9..77c82d9a9 100644 --- a/crypto/src/asn1/cms/SCVPReqRes.cs +++ b/crypto/src/asn1/cms/SCVPReqRes.cs @@ -28,7 +28,7 @@ namespace Org.BouncyCastle.Asn1.Cms if (count < 1 || count > 2) throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); - m_request = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, true, ContentInfo.GetInstance); + m_request = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, true, ContentInfo.GetTagged); m_response = ContentInfo.GetInstance(seq[pos++]); if (pos != count) diff --git a/crypto/src/asn1/cms/SignerIdentifier.cs b/crypto/src/asn1/cms/SignerIdentifier.cs index 055a393df..8899d94e9 100644 --- a/crypto/src/asn1/cms/SignerIdentifier.cs +++ b/crypto/src/asn1/cms/SignerIdentifier.cs @@ -27,10 +27,11 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("Illegal object in SignerIdentifier: " + Platform.GetTypeName(o), nameof(o)); } - public static SignerIdentifier GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) - { - return Asn1Utilities.GetInstanceFromChoice(taggedObject, declaredExplicit, GetInstance); - } + public static SignerIdentifier GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetInstanceChoice(taggedObject, declaredExplicit, GetInstance); + + public static SignerIdentifier GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetTaggedChoice(taggedObject, declaredExplicit, GetInstance); private readonly Asn1Encodable m_id; diff --git a/crypto/src/asn1/cms/SignerInfo.cs b/crypto/src/asn1/cms/SignerInfo.cs index fbd4bcca7..5866f98da 100644 --- a/crypto/src/asn1/cms/SignerInfo.cs +++ b/crypto/src/asn1/cms/SignerInfo.cs @@ -59,10 +59,10 @@ namespace Org.BouncyCastle.Asn1.Cms m_version = DerInteger.GetInstance(seq[pos++]); m_sid = SignerIdentifier.GetInstance(seq[pos++]); m_digAlgorithm = AlgorithmIdentifier.GetInstance(seq[pos++]); - m_authenticatedAttributes = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, Asn1Set.GetInstance); + m_authenticatedAttributes = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, false, Asn1Set.GetTagged); m_digEncryptionAlgorithm = AlgorithmIdentifier.GetInstance(seq[pos++]); m_encryptedDigest = Asn1OctetString.GetInstance(seq[pos++]); - m_unauthenticatedAttributes = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetInstance); + m_unauthenticatedAttributes = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 1, false, Asn1Set.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); diff --git a/crypto/src/asn1/cms/Time.cs b/crypto/src/asn1/cms/Time.cs index 8dbca7a27..f59d9f63c 100644 --- a/crypto/src/asn1/cms/Time.cs +++ b/crypto/src/asn1/cms/Time.cs @@ -23,10 +23,11 @@ namespace Org.BouncyCastle.Asn1.Cms throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), nameof(obj)); } - public static Time GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) - { - return Asn1Utilities.GetInstanceFromChoice(taggedObject, declaredExplicit, GetInstance); - } + public static Time GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetInstanceChoice(taggedObject, declaredExplicit, GetInstance); + + public static Time GetTagged(Asn1TaggedObject taggedObject, bool declaredExplicit) => + Asn1Utilities.GetTaggedChoice(taggedObject, declaredExplicit, GetInstance); public static Time GetOptional(Asn1Encodable element) { diff --git a/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs b/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs index 68a6367e5..1cb4f4ff5 100644 --- a/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs +++ b/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs @@ -36,7 +36,7 @@ namespace Org.BouncyCastle.Asn1.Cms.Ecc throw new ArgumentException("Bad sequence size: " + count, nameof(seq)); m_ephemeralPublicKey = OriginatorPublicKey.GetInstance(seq[pos++]); - m_addedukm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, true, Asn1OctetString.GetInstance); + m_addedukm = Asn1Utilities.ReadOptionalContextTagged(seq, ref pos, 0, true, Asn1OctetString.GetTagged); if (pos != count) throw new ArgumentException("Unexpected elements in sequence", nameof(seq)); |