1 files changed, 15 insertions, 28 deletions
diff --git a/crypto/src/cms/CMSEnvelopedDataStreamGenerator.cs b/crypto/src/cms/CMSEnvelopedDataStreamGenerator.cs
index 90ecf0748..4a8b57aad 100644
--- a/crypto/src/cms/CMSEnvelopedDataStreamGenerator.cs
+++ b/crypto/src/cms/CMSEnvelopedDataStreamGenerator.cs
@@ -246,44 +246,31 @@ namespace Org.BouncyCastle.Cms
_out.WriteByte(value);
}
-#if PORTABLE
protected override void Dispose(bool disposing)
{
if (disposing)
{
- ImplClose();
- }
- base.Dispose(disposing);
- }
-#else
- public override void Close()
- {
- ImplClose();
- base.Close();
- }
-#endif
+ Platform.Dispose(_out);
- private void ImplClose()
- {
- Platform.Dispose(_out);
+ // TODO Parent context(s) should really be closed explicitly
- // TODO Parent context(s) should really be closed explicitly
+ _eiGen.Close();
- _eiGen.Close();
+ if (_outer.unprotectedAttributeGenerator != null)
+ {
+ Asn1.Cms.AttributeTable attrTable = _outer.unprotectedAttributeGenerator.GetAttributes(
+ new Dictionary<CmsAttributeTableParameter, object>());
- if (_outer.unprotectedAttributeGenerator != null)
- {
- Asn1.Cms.AttributeTable attrTable = _outer.unprotectedAttributeGenerator.GetAttributes(
- new Dictionary<CmsAttributeTableParameter, object>());
+ Asn1Set unprotectedAttrs = new BerSet(attrTable.ToAsn1EncodableVector());
- Asn1Set unprotectedAttrs = new BerSet(attrTable.ToAsn1EncodableVector());
+ _envGen.AddObject(new DerTaggedObject(false, 1, unprotectedAttrs));
+ }
- _envGen.AddObject(new DerTaggedObject(false, 1, unprotectedAttrs));
- }
-
- _envGen.Close();
- _cGen.Close();
- }
+ _envGen.Close();
+ _cGen.Close();
+ }
+ base.Dispose(disposing);
+ }
}
}
}
|
