Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public CryptographicException(string format, string insert) { }
public partial class CryptoStream : System.IO.Stream, System.IDisposable
{
public CryptoStream(System.IO.Stream stream, System.Security.Cryptography.ICryptoTransform transform, System.Security.Cryptography.CryptoStreamMode mode) { }
public CryptoStream(System.IO.Stream stream, System.Security.Cryptography.ICryptoTransform transform, System.Security.Cryptography.CryptoStreamMode mode, bool leaveOpen) { }
public override bool CanRead { get { return default(bool); } }
public override bool CanSeek { get { return default(bool); } }
public override bool CanWrite { get { return default(bool); } }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,22 @@ public class CryptoStream : Stream, IDisposable
private bool _canWrite;
private bool _finalBlockTransformed;
private SemaphoreSlim _lazyAsyncActiveSemaphore;

private readonly bool _leaveOpen;

// Constructors

public CryptoStream(Stream stream, ICryptoTransform transform, CryptoStreamMode mode)
: this(stream, transform, mode, false)
{
}

public CryptoStream(Stream stream, ICryptoTransform transform, CryptoStreamMode mode, bool leaveOpen)
{

_stream = stream;
_transformMode = mode;
_transform = transform;
_leaveOpen = leaveOpen;
switch (_transformMode)
{
case CryptoStreamMode.Read:
Expand Down Expand Up @@ -523,7 +530,10 @@ protected override void Dispose(bool disposing)
{
FlushFinalBlock();
}
_stream.Dispose();
if (!_leaveOpen)
{
_stream.Dispose();
}
}
}
finally
Expand Down
29 changes: 27 additions & 2 deletions src/System.Security.Cryptography.Primitives/tests/CryptoStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,35 @@ public static void NestedCryptoStreams()
public static void MultipleDispose()
{
ICryptoTransform encryptor = new IdentityTransform(1, 1, true);

using (MemoryStream output = new MemoryStream())
{
using (CryptoStream encryptStream = new CryptoStream(output, encryptor, CryptoStreamMode.Write))
{
encryptStream.Dispose();
}

Assert.Equal(false, output.CanRead);
}

using (MemoryStream output = new MemoryStream())
{
using (CryptoStream encryptStream = new CryptoStream(output, encryptor, CryptoStreamMode.Write, leaveOpen: false))
{
encryptStream.Dispose();
}

Assert.Equal(false, output.CanRead);
}

using (MemoryStream output = new MemoryStream())
using (CryptoStream encryptStream = new CryptoStream(output, encryptor, CryptoStreamMode.Write))
{
encryptStream.Dispose();
using (CryptoStream encryptStream = new CryptoStream(output, encryptor, CryptoStreamMode.Write, leaveOpen: true))
{
encryptStream.Dispose();
}

Assert.Equal(true, output.CanRead);
}
}

Expand Down