diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2019-06-04 16:55:26 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2019-06-04 16:55:26 +0700 |
| commit | 3eb93b423abeefbdc03f0ecc38751d76428ba23e (patch) | |
| tree | f364f857c54f65eb59462560b1f282b896eecf8b /crypto/src/asn1/cms/AuthenticatedData.cs | |
| parent | Port LinkedCertificate from bc-java (diff) | |
| download | BouncyCastle.NET-ed25519-3eb93b423abeefbdc03f0ecc38751d76428ba23e.tar.xz | |
Refactoring
Diffstat (limited to 'crypto/src/asn1/cms/AuthenticatedData.cs')
| -rw-r--r-- | crypto/src/asn1/cms/AuthenticatedData.cs | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/crypto/src/asn1/cms/AuthenticatedData.cs b/crypto/src/asn1/cms/AuthenticatedData.cs index 6f13a6f30..eb9f82031 100644 --- a/crypto/src/asn1/cms/AuthenticatedData.cs +++ b/crypto/src/asn1/cms/AuthenticatedData.cs @@ -196,33 +196,13 @@ namespace Org.BouncyCastle.Asn1.Cms public override Asn1Object ToAsn1Object() { Asn1EncodableVector v = new Asn1EncodableVector(version); - - if (originatorInfo != null) - { - v.Add(new DerTaggedObject(false, 0, originatorInfo)); - } - + v.AddOptionalTagged(false, 0, originatorInfo); v.Add(recipientInfos, macAlgorithm); - - if (digestAlgorithm != null) - { - v.Add(new DerTaggedObject(false, 1, digestAlgorithm)); - } - + v.AddOptionalTagged(false, 1, digestAlgorithm); v.Add(encapsulatedContentInfo); - - if (authAttrs != null) - { - v.Add(new DerTaggedObject(false, 2, authAttrs)); - } - + v.AddOptionalTagged(false, 2, authAttrs); v.Add(mac); - - if (unauthAttrs != null) - { - v.Add(new DerTaggedObject(false, 3, unauthAttrs)); - } - + v.AddOptionalTagged(false, 3, unauthAttrs); return new BerSequence(v); } |