diff --git a/crypto/src/cms/CMSCompressedDataStreamGenerator.cs b/crypto/src/cms/CMSCompressedDataStreamGenerator.cs
index 9a9c29b01..855367320 100644
--- a/crypto/src/cms/CMSCompressedDataStreamGenerator.cs
+++ b/crypto/src/cms/CMSCompressedDataStreamGenerator.cs
@@ -6,7 +6,6 @@ using Org.BouncyCastle.Asn1.Cms;
using Org.BouncyCastle.Asn1.X509;
using Org.BouncyCastle.Utilities;
using Org.BouncyCastle.Utilities.IO;
-using Org.BouncyCastle.Utilities.Zlib;
namespace Org.BouncyCastle.Cms
{
@@ -27,7 +26,10 @@ namespace Org.BouncyCastle.Cms
*/
public class CmsCompressedDataStreamGenerator
{
- public const string ZLib = "1.2.840.113549.1.9.16.3.8";
+ public const string ZLibOid = "1.2.840.113549.1.9.16.3.8";
+
+ [Obsolete("Use 'ZLibOid' instead")]
+ public const string ZLib = ZLibOid;
private int _bufferSize;
@@ -88,19 +90,19 @@ namespace Org.BouncyCastle.Cms
eiGen.GetRawOutputStream(), 0, true, _bufferSize);
return new CmsCompressedOutputStream(
- new ZOutputStream(octetStream, JZlib.Z_DEFAULT_COMPRESSION), sGen, cGen, eiGen);
+ Utilities.IO.Compression.ZLib.CompressOutput(octetStream, -1), sGen, cGen, eiGen);
}
private class CmsCompressedOutputStream
: BaseOutputStream
{
- private ZOutputStream _out;
+ private Stream _out;
private BerSequenceGenerator _sGen;
private BerSequenceGenerator _cGen;
private BerSequenceGenerator _eiGen;
internal CmsCompressedOutputStream(
- ZOutputStream outStream,
+ Stream outStream,
BerSequenceGenerator sGen,
BerSequenceGenerator cGen,
BerSequenceGenerator eiGen)
|